(bug 18001) Rollback of null edit should restore flag

diff --git a/docs/hooks.txt b/docs/hooks.txt
index fae74e3..f973d6b 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -441,6 +441,7 @@ $isWatch: (No longer used)
 $section: (No longer used)
 $flags: Flags passed to Article::doEdit()
 $revision: New Revision of the article
+$baseRevId: the rev ID (or false) this edit was based on
 
 'ArticleUndelete': When one or more revisions of an article are restored
 $title: Title corresponding to the article restored

diff --git a/includes/Article.php b/includes/Article.php
index a8d4a81..fdaa241 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1771,7 +1771,7 @@ class Article {
                $status->value['revision'] = $revision;
 
                wfRunHooks( 'ArticleSaveComplete', array( &$this, &$user, $text, $summary,
-                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status ) );
+                       $flags & EDIT_MINOR, null, null, &$flags, $revision, &$status, $baseRevId ) );
 
                wfProfileOut( __METHOD__ );
                return $status;